Removed unnecessary functions