Removed test-code.
Small cleanup of minor issues.