Cleanup

Still needs work.