profile code cleanup and fixes
fixing r10k template