Cleanup of not needed code due to this functionality is handled by XO.
Cleanups of unnecassary code.
Found mapping bug in Titan's property manager.
Fixed tests related to mappings.