more cleanup & revert some changes