Removed margins from HardwareSoftwareMapping