Adding in cleanup in case of a unclean build environment