Removed old references and cleaned up files.