Removed unnecessary functions
Minor cleanup