Some improvements and unnecessary file removement