remove old cruft
misc minor brakeman fixes