Remove the feature layer class

It had the feature envy code smell - http://en.wikipedia.org/wiki/Code_smell