Remove unused variables and files