Code cleanup #23