Removed Unneeded Functions