Some cleanup of files in FBA Cores