removing all this dumb stuff