Continuing to cleanup