Continue the asesome 3.5 clean/update