removed unused stuff for merge