Do some cleanup, prepare for free auth...