Removed some unnecessary methods that have been superceded