Cleanup

Remove useless references.