CSH-1237 - #time 1h #comment - Commented out server code as its not planned for Phase2