cleanup codestyle, remove unused things

i profited from the fact that there is no open PR currently, and went over everthing...