Remove unecessary dave code