clean up, mod for new pi