removed weird HEAD and parent stuff

Also removed code that was from my branch. weird.