Added signed apk and some cleanup