Removed some references that were not needed