Fix more compiler warnings C4091 and cleanup related files.

Signed-off-by: Tobias Lorenz <tobias.lorenz@etas.com>