removed some no longer needed changes