WIP: Remove debug comments
WIP: Fix mapping.c warnings