Removed check from old bug
Renamed class and cleaned up obsolete code