Fixed unit attachments not being properly unblocked sometimes. Removed potential trailing reference to attached entity