Removed comments and placed into SQL