remove this old school class
bunch of comments