Remove TODO x2
Merge branch 'ui' of https://github.com/SharUTC/SharUTC into ui