Comment camera2activity and remove uneccessary class