Cleanup

Removed dependency on WipeTransition, which is unused.

Also trimmed trailing white space