Excessive logging disabled; TODOs fixed