Added seperate Time for Comcheck at norrokie

also some cleanup
Merge remote-tracking branch 'origin/develop'