Done to much to say in a commit message. Ignore dead dimension code