t560 - cleaning things up for production use