Removed some unnecessary work