Cleanup and prep for wp support