clean up
added 4 more simple hooks