Remove old code
Merge pull request #57 from fluxroot/remove-old-code

Remove old code