removed used stuff for the merge