some fixes to run
delete unused code