Add IgnoreInheritedFields support and cleanup unused files