Remove two classes - options and filters. RIP