Removing old classes I forgot to