Correct cleanViews invocation of cleanup methods

Ensure that cleanViews invokes cleanup methods in the context of the
target layout.