More cleanup, preparing for actual code