cleanup more of asytle's mess