Removing old code
Merge pull request #2306 from tschaub/new

Remove old code.