infrastructure review, removed support for non-vicare implementations
code review