Cleaned stuff up to reduce the size of the .apk