Issue ID: 0
code-cleanup