cleanup fix3