Remove old style classes (#42)