Cleanup deprecated Expression interfaces and unused classes