Clean up interface
Contract!
Not needed
Defaults are nicer this way..