Cleaned up for Chrome app version.