removed some useless scaffolded code
merge