fixed build and cleaner