Remove url from Makefiles and some more cleanup