add missing methods
remove unused field