Post move code cleanup.