Minor changes and removed unneeded cpp file