Remove old code
Merge pull request #316 from mistio/remove_old_code

Remove old code