[IMP] Removed un-neccessary code