cleaned guardian up