Removed another unnecessary class