cleanup by removing legacy artifacts