Added experimental optimization.

Removed clean up on unmount because causing runtime error.

There is a problem with short name name comparison/searching.