Remove commented out class!