Tidying up unnecessary classes