Cleaning up the Distribution Center codebase