cleaning up code to have only fut7 sources