Remove idiotic workarounds