clean up and added block owner