MOBILE-557 Delete remaining sites references
MOBILE-527 Fixes in FS library