Code cleanup for release