Code cleanup, home override option