Cleaning: remove unused variables and imports