Updated to remove input helpers