General cleanup and wildcard removal

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