Remove some of the non-implemented annotations