Removed workarounds