Improve Makefiles - now all works as it should, remove unnecessary code