Removed a lot of extra code

closes #9