remvoved more memory stuff