Cleaned up project and removed archaic make stuff