Final code cleanup before release