Removing variables and fixing make file so dependencies are met