Cleans up even more code

Signed-off-by: Gora Khargosh <gora.khargosh@gmail.com>
6 files changed