Remove unused definitions. Clean whitespace.