Massive cleanup for release