Post GIT Corruption - rebuild utility components