a little clean up and deleting not useful things
delete extra things
a lot of reordering, but maybe this works?