Fix some more stuff
Remove Option (it was useless)