Fixed drive amplitude checks
clean up some unused functions