cleanup, mainly remove unused and duplicated data