Fixed build
REmoved old stuff
Bye
Merge branch 'master' into dev
done