varous fixes
remove obsolete methods