removed a lot of deprecated things