cleanup and todos