starting to cleanup...