remove unneeded patch, add some props