Small fixes/Remove dead options