Code cleanup for final release