Stripped some debug statements