Removed code which is redundant