bipy clean up (@ElBrogrammer, sorry to steal your glory ;)