Patch from Nicolas Pitre

Minor cleanup of Lubbock specific code, like removal of
redundant mappings. 
Also a prerequisite for some upcoming patches.