Some cleanup for release