Feature/cleanup expired tokens

First step towards keeping the databases clean