Removed debugging code from master