Cleanups (RIPD-532)
[FOLD] More small cleanups
[FOLD] Removing a door doesn't mean adding it