make / remove unused variables