Just cleaned up file system and removed warnings