remove use of deprecated methods (use new fluent api)