cleaned out dead code