Removed super class that is not necessary anymore