Removing crufty code that is no longer necessary. Code cleanup.