Removing use of featureGroup
Removing useless code