Removed unnecessary function refs