Added an empty default and removed a few unused classes