GEM Bestpractices. Removed unused helpers