remove unused code, less whitespace