Revert "Merge branch 'Names' into 'pregmod-master'"

This reverts merge request !1708 (merged)

When I get a error on launch in regards to something unclosed, there is definitely a problem. I'm also not sorting through that many changes to find it. So, @klorpa this one is on you. Pose a new merge request when the bugs are fixed.