CLEAN: remove unused code