Removed dynamic definition of API interfaces and tools.
Removed group tools.
Removed unreachable return statement.