Some changes and enhancement
Delete file