cleanup in unused code