cleanup whitespace and comments
remove unused classes