More of a cleanup