Removed almost all changes for picker