Remove unnecessary mandatory's and fix missing )