-- Remove functionality added