delete unused file
update against core changes