Commented bug testing code out.