Removing unused variables/imports