Remove some redundancies from the makefile