removed some references and cleaned up a few things