cleaned up folders even more