Removed unused clause & added unit test