Removing extra function