Code clean up. UI Automator goal is ready to be submitted.