Code cleanup prior to demo