Removed unnecessary ClassHelper class