clean up comments and excess classes