starting to clean up...