Added option to remove color