Clean up Utilities implementation
Clean up File Sources implementation
Clean up Buffer Sources implementation