Remove deprecated code
Reduce the ammount of module binaries being passing around