Deleted Commented Out Code

Signed-off-by: Justin Yost <justin@loadsys.com>
Some code sniffer improvements

Signed-off-by: Justin Yost <justin@loadsys.com>