APOLLO-3946 Removed old traits and interfaces
APOLLO-3946 Merged both haddocuments interfaces into one
APOLLO-3946 Updated usage of documents
APOLLO-3946 Updated unit tests