Continuing Cleanup

yup