removes usage of deprecated behaviours