Removed unnecessary function calls