removed defaults

Mind if I do this now?