cleanup.
Merge pull request #1 from 4teamwork/deif-cleanup

cleanup.