Completed file functionality and removed stream