* removed some old bloat