Removed or commented workarounds and temporary changes