some cleanups
at the price of even worse evil (slightly) we have an automatic lifting with ISE constr

patch does not work yet :-(