Deleting diagnostic utilities
Fixing Makefile
Updated