Cleanup unused code & files