Removing an unnecessary function