clean up and update to 7.28