Added todos for cleanup