Cleaned up completed TODO items