Dropping more files

Up to String manipulation