remove version checking, since this is a bit premature
and, finally, flatten attributes