Cleanup unused using-blocks and updated file headers