Resolve #3 - Removed test code.