Cleanup and simplfy the entire apk. Code remains the same just cleaned

Signed-off-by: travp624 <travp624@gmail.com>