cleaned up unfinished class