Cleanup strings + unused stuf