Clear hacks to fix status switch positioning