Cleanup
Changed options that no longer exist