Cleaned up annotations and unused variables.