cleaning up 8