working on massive clean up