Cleanup

Test without -DUSE_GENLOCK