Fixed errors regarding duplicate clean_ functions