Cleanup

Did some housekeeping