Removed unnecessarily helpers