Fixed compatibility issue with ADT14 and cleaned automatic TODO statements.