Cleanup unused variables and code