Preparation for code cleanup