Removed test code
Fixed warnings