Added cleaner build for demo and dist