claenup: removed comments