Some clean up to build tasks, adding clean task