Update spec
Remove old method
Remove constractor