more 2.1 stuff
removed most synthetic accessor methods