code cleanup for release