remove the dependancy on strongarm, and stop including the features inc file