Revert "Added needed grade1 factory"

This reverts commit b9253c88aebf15ec985420ecb422b08d045809e0.
Reverted revert - back to latest commit
Marked accordian specs as pending - accordian is not yet implemented