Fix removed options issue temporarily

This needs to be refactored at some point...