Dropping unnecessary workarounds