Revert "Hacks to build"

This reverts commit 1dbed1de57e956c44ff1890e031f8be1aa79cf82.
Revert "Revert "Remove obsolete options""

This reverts commit cba43a7191ee8646499ca2c3b6270bbf90327c65.