Integrate jamesward cleanup and release