more cleanup (remove quantum and the like)