Reduce remap.h inclusion to where it's needed
Remove unused REMAP feature