cleanup and marking todo's