Cleaned up PD patches