OCSADV-27 Code cleanup and removal of clauses using Try #time 30m