Added comments, removed obsolete classes