CLENAUP remove comments and ws