Code cleanup realized