remove useless files and move variables