Simplify helper methods
Remove empty spec file