Removed un-necessary condition