Removed excess helpers