Some cleanup in Makefile. Target dependencies are not well working at the moment.