More cleanup and dependencies move around