Removed some unnecessary logic