remove property workarounds