Removed unused/useless helpers