cleanup codestyle, remove unused things