Remove un-needed parts where defaults could actually be used directly Closes: #153 (closed) [ci skip]