2448: refactor

we will add these (removed) features back