Remove needless Class
OptionsParser: add missing requires