Some cleanings and changes to update for optimus >= 0.6.4 usage, bumping 0.3.5.1