Removed Unnecessary workarounds