clean up.. hooks still didn't work out