Cleanup unused code, etc.