remove temp defines