Removed some of the previous changes