remove unecessary workaround