Removed test code.
Resolving conflicts.