clean up and todos