Removed unnecessary fundtion