removed some dumb stuff