Try turn off stupid messages
Cleanup code
Add missing spec