Remove legacy code, mostly related to 1.2 compatibility