Minor cleanup. Removed FileManagerClass