A general clean up