reomved more unused stuff