replaced a lot of deprecated code; if someone runs into a commit conflict afterwards...