Removed some logic which is redundant