Code cleanup.mvc needs fix