remove old code
Merge pull request #4 from djotto/remove_old_code

Remove old code