cleaned unsupported API + decorated Admin API