revert last comm's 2 clean up + enable camcoder fix