NVR-003: Removing unnecessary module to make cloning a bit easier