Cleanup unused code
Merge branch 'cleanup'