cleaned up completed TODOS