Removed temp.java, General cleanup (unused imports and variables).