Final cleanup before beta testing