Cleanups

#395, #457