Remove shoulda dependency
Bug fix