Cleanup.
Updated for Maya 2015