Got rid of some remenet code