Remove hacks as they are no longer needed