App update version 1.2 & cleanup
App update version 1.2 & cleanup