Slight modification and removal of unnecessary file