Trimming

Fixes #124.

c67a78e8 was reverted and the databases on evaluierung and evapdev have been updated.