Removed unnecessary defines.

Partly fixes #237