refactor and deleted unused specs