remove Map Functions