JohnCorby use good patches, cleanup