Merge "Removing unneeded files"