Cleanup code, remove unused code and files