Started doing a cleanup