Removed duplicate classes leftover from previous commit.