bugfix: remove comments & defaults