Remove TODO as the items on it are complete
Clean up