Merge pull request #2 from haikezegwaard/master

removed unused code, cleaned up some files
fixed feature removal