Removed Commented-Out Code and the KLVParser.h as a dependency