simplified objectmodel
cleanup of junk functionality