Removed unused package, resolved probems from merging with master prject