Add note and remove unneeded debug messages