Remove version for Quack
Tidy up