removed unused class and pointless commented code at the beginning