Fix import (remove debugging code?)