Clean up old workaround