cr related fixes - removed home path as it's not required.