Removed unnecessary parameterizations from definitions