Specs: A bit of refactoring and removing deprecated techniques