First cleanup of guards