Fixed the previous changes and deleted some shadow files