Removed stuff in code that we don't need.
Merge pull request #57 from swentel/DEV

Removed stuff in code that we don't need.