Added delete and cleanup operations