cleanup sample ... add hooks