quite a bit of cleanup for the object controller plugin