Remove workarounds and cleanup