IP issue and baselayout cleanup