clean up sources - mr proper