Remove stupid API mappings