Cleaned up feature package.