Removed some redundant or deprecated methods