Cleanup of defines