Clean up a bit

Clean up debug statements and comment out id field to rely on
autoincrement values.