Added cleanempty