Cleaning out the last bugs