Getting rid of this spec nonsense