[helpers] Cleanup