010.03 Cleanup and some minor memory use optimization