Removed legacy draw / build params and todos