Removed deprecated methods - code grooming