Whitespace cleanup, remove unused classes