removed unused stuff, minor cleanup