Remove unuseful stuff
See issue #90