remove legacy code
Move default params into corresponding subclasses