-- Removed unnecessary piece of code