Removed extra func