Remove unused option
Fix order of things at installation