a bit more annotations cleanup