Removed cleanup from todo