cleanup attributes
rid of obsolete parameter
even more attributes