bday cleanup, removed unused classes