Removed duplicate clean_ functions