Removed some TODO's that were already done :-)