removed some likely dead code