remove stale file, fix class stuff