Additional code cleanup.