Remove unnecessary changes from Cube driver