Removing debugging/testing stuff