Time for a cleanup. :)