fusion source code clean up