Removed dead classes, corrected return value