GEP-6 Code cleanup for v4.4 compatibility