cleaned out excess parameter definitions