Delete unused code and whitespaces