Correct cleanViews invocation of cleanup methods

Ensure that cleanViews invokes cleanup methods in the context of the
target layout.
Merge pull request #329 from jugglinmike/328-cleanup-invocation

Correct cleanViews invocation of cleanup methods