Remove DATABASE defs.
Remove DATABASE defs.
Merge pull request #29 from kochw/master

Remove DATABASE defs.