Feature #2570: Small fixes
Clean compatibility removing 4.4 contents