clean up defines