Some cleanup after the Major rewrite