clean up done for now
for one thing
Merge branch 'dev-code-cleanup'