Removing optional inputs #26