Back to class mapping.
Fix warnings. Remove temporary log method.