removed more things
removed more things, almost nailed