More cleanup and dependencies move around
2 files changed