Attempt to clean up mess in features and remove comment module dependency