cleanup work, initial work on new project