Removed redundant classes and dependencies pulled in from last merge of features...