Mechanical code cleanup (blueprint)