Removed useless TODO's in GUI