Removed the custom picker