Additional code drop and cleanup.