cleaned up unneeded references