Remove special options needed to run demos