Code cleanup #1