Clean up workarounds