Update based on code review and remove apps that are not used or referenced