removed some crud