Preparing for code cleanup branch